Oops, one hypervisor.h change seems to have unfixed in the merge
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Thu, 15 Sep 2005 00:00:23 +0000 (18:00 -0600)
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Thu, 15 Sep 2005 00:00:23 +0000 (18:00 -0600)
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c

index 98a6fd95d0ffea3931fda232b62b59a5c4f59df9..624d85a676023ceea7a36b0d8b108f7ad31a49bf 100644 (file)
@@ -26,7 +26,7 @@
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
 #include <asm-xen/linux-public/privcmd.h>
-#include <asm-xen/linux-public/hypervisor.h>
+#include <asm/hypervisor.h>
 #include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/dom0_ops.h>
 #include <asm-xen/xen_proc.h>